From bf1a13913a5f378f70eed3063c35bf69da2477c4 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Fri, 4 Apr 2025 16:33:56 +0200 Subject: [PATCH] we must not use QFile::remove that may fail on windows read-only files Signed-off-by: Matthieu Gallien --- src/gui/conflictsolver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/conflictsolver.cpp b/src/gui/conflictsolver.cpp index 780e4087b..5292d48e3 100644 --- a/src/gui/conflictsolver.cpp +++ b/src/gui/conflictsolver.cpp @@ -95,7 +95,7 @@ bool ConflictSolver::deleteLocalVersion() if (FileSystem::isDir(_localVersionFilename)) { return FileSystem::removeRecursively(_localVersionFilename); } else { - return QFile(_localVersionFilename).remove(); + return FileSystem::remove(_localVersionFilename); } } -- 2.39.5